fixing rubocop
fixing conflicts