repair after conflict