fix some merge issues from last commit