fixing database conflicts...again
fixing more merge conflicts