made pbxproj mergeable