Create conflict_test.py

This may not work. But the assumption is that by deleting the if statement, we can create a merge conflict.