Update conflict_test.py