Wrong merges fixed