fix small merge issues