Fixed minor merge issues