I did all the things.
I did all the things, then fixed all the conflicts.