Every time I merge a branch the pbxproj has a conflict so I have to close and reopen the project in Xcode. Annoying. 2013/12/13