wrote resolveConflict