fixing database merge conflict problem