Update conflict_test.py
Merge pull request #2 from bjnovak/Test

Update conflict_test.py