Removed checkout file (handles local git) that caused the merge conflicts.
Also removed .cxuserstate file (keeps track of local xcode stuff).