Update update.py
remove line
resolve merge conflict
remove comments
resolve merge conflict
fix merge conflict