I am adding and commint a change and a new file in a branch.
Let's see what happens now.
After all I am just learning GIT
I resolved conflict on branch and now commit