As I said... git is not easy