I want to create some conflict
green div ready
div blue ready to merge
conflict solved
amended commit
branch master change
changes in not master