trying to get all the things merged