Resolve merge issue