What happened to conflict?

Then press Ctrl-M