fix some merge issues