script to trigger merge conflict