Integrated conflict resolvers