reset database
fixed conflicts