t.py init
merge fixing