Added mongodb
Added mongodb and resolved conflicts