dealing with git again