Conflict resolvers

This is, as far as I know, the final required piece of the new version.