little fix in merge