Added "and" between adjectives to emphasize both words
Use fancier words to make the point more clearly
Merge remote-tracking branch 'origin/edit-1'
fixed the second merge conflict