Setting up a merge test for conflicts when merging