Tweaked merge again