finish push task
fix conflict