db model stuff
fixed conflicts