fixed minor merge issues