repair more problems with conflict