resolved conflict between internal chaos bson and mongo one

Change-Id: I58341d11a9661261393da44429e119fdc702fce1