fix merges (true one)