changed a line in test.py to make a conflict