fix merge issues

fix the merge issues from last commit