git: I mistook merge