fix push and pull