dev after master reset head
test reset merge
Merge branch 'master' into dev
dev
Merge branch 'master' into dev