Commit to test the effects of Merge conflicts on other files
Merge remote-tracking branch 'origin/VS_branch' into VS_branch
Commit before a merge conflict
After conflict resolution