Commit from the "SecondBranch"
Commit from terminal - Conflict resolved in the secondbranch