fix merge conflicts (?)