merge correction