merge fixes yayyayay