Added conflict resolvers all, quit