working on dev branch
commit after stash apply
before squash
a
after merging and conflic resolve
work on dev
merge with dev branch