fixed #6
fix conflicts
fix db conflict