Fixing merge, part 4