removed a forgotten merge conflict