rubocop madness fixed
fixed merge conflict
fixed another rubocop