delete test1 dev
edit just for dev
edit just for master
conflict fixed