trying to figure out why merges are fucked up