create confict state
fully commit for learning branch in git
finish commit on branch 1
issue 53
Commit on branch1
resolve conflict