Fixing merge, part 3