rubocop fixes
conflict fix