fixing a problem where the merge didnt pull in all my changes