Upstream merge scripts