fixes push and pull issues