minor merge issues