edited test.py
solved conflicts