new dev branch test
new feture1 branch == and simple
new branch feture1 == & simple
conflict fixed