fixing db merge conflict