Commit to Second branch file initially
haha
Resolving conflicts in Second Branch
Completing Second branch