added dependency, DBConnector
merge and resolved conflicts