solution changes
commit merge
Merge branch 'dev'
Merge branch 'master' into dev