No changes at all -- git is confused again