finish manual push
fix conflict