db schema updates, design corrections post merge conflicts