conficlt
Merge branch 'dev' of https://github.com/MoonstoneAquamarine/learngit into dev
fix conficlt in dev remote