Thanks to Kendall Helmstetter Gelner on SO for this script to clean up the xcode project after a merger

Fixxcodemerge.sh

#!/bin/sh

    projectfile=`find -d . -name 'project.pbxproj'`
    projectdir=`echo *.xcodeproj`
    projectfile="${projectdir}/project.pbxproj"
    tempfile="${projectdir}/project.pbxproj.out"
    savefile="${projectdir}/project.pbxproj.mergesave"

    cat $projectfile | grep -v "<<<<<<< HEAD" | grep -v "=======" | grep -v "^>>>>>>> " > $tempfile
    cp $projectfile $savefile
    mv $tempfile $projectfile
    
  #http://stackoverflow.com/questions/2615378/how-to-use-git-properly-with-xcode