init
merge confilict solved
mypi.py modified