Test for no conflict
Merge branch 'Fourth-no-conflict-branch'