Refactor resolveConflict