* fixed pull and fast-forward