Db merge & conflict resolved