update push.py
repair confict