this should help unless it's really broken
Merge remote-tracking branch 'origin/master'