commenting out database connections for now
merge issues fix
merge removal