fixed styling remove database dependencies
fixed merge conflicts?