Added mysql connection
solved conflicts