implemented quick and dirty merge