before merge
after merge new db
merge
remove
fix conflict