Fix merge conflict marks