1int commit
with conflicts
after rewriting conflicted merged files
Int. after merge conflict solve
first day fixes of testing project