Update merge.ctp