fixing db merge issue