Update again - git isn't as smart as he looks