Quick fix in merge.