fixed issue with push and pull