Manually fixed push issues
Manually fixed pull issues
Manually fixed pull issues