Resolve conflict in autocad for mac and windows