resolve conflicts in model.py
resolve conflicts in model.py

qingqing01/models,Superjom/models-1,kuke/models,Superjom/models-1,lcy-seso/models,lcy-seso/models,kuke/models,PaddlePaddle/models,xinghai-sun/models,kuke/models,PaddlePaddle/models,qingqing01/models,Superjom/models-1,xinghai-sun/models,PaddlePaddle/models,qingqing01/models,kuke/models,xinghai-sun/models,xinghai-sun/models,lcy-seso/models