Creating conflict for teting --abort
conflict solved
index file changed
index file changed
one more commit to test merge
already up-to-date problem solved