Fighting with git...