Fixing merge conflict markers. How did those get there?