bug in merge