Added "and" between adjectives to emphasize both words
Merge branch 'edit-1'
merge edit 1