Rebuild schema after merge
Fix errors resulting from merge