add dev2.py
solve conflicts