Progress on conflict resolvers