Merge mess up repair