Bug in merge