myBranch commit
master commit
Conflict Resolved