Created a more general repo and integrated missing merge script in it