fix the conflivt and push