Do the merge if if override=false, refactor for rubocop