Stuff
resolving conflict
More stuff
resolving conflicts