resolve database table conflicts