added mongodb java driver
fixed conflicts