fixing file mangled by merge conflicts