Undo incorrect code changes made during merge conflict.