have to fix some merge issues