Update conflict_test.js