added upstream merge script