Upstream merge with conflicts.