styling changes
fixed database connection
fixed merge conflicts