Why does git get so confused...