git is confusing, things good now one hopes