adding gitattr to change merging for pbxproj