YAHOO QE -- Resolve merge conflict