merge mistake repair