Fixed syntax bugs in merge.