Creating a merge conflict to check windows tool