More fighting with git...