this happens all the time, so im pretty sure im just garbage at git or something, but i wonder if theres a way for me to just make it so that my changes are in the state theyre supposed to.