Correct wrong merge