fixed xcodeproj/project.bjxproj merge errors