fixed some rubocop errors
fixed merge conflict
Merge pull request #211 from koelncampus/a-matter-of-style

fixed some rubocop errors