hey i hate git merging it like erased all the changes that i wanted to merge in, whatever