Resolve merge conflict x3.