edited test2.py
fixed merge