Conflict resolver.
Stuff.
Fix stuff.