removed merge conflict markers from code