Testing branching
Modified branch and made a conflict for merging
Resolved Conflicts