Stuff
Merge resolved
New stuff
Merge conflict