fix merge issues from earlier