Fixing merge, part 1