fix various merge issues