working with bad structure
idk wha is going on with these merges