changes because of rubocop
merge conflicts