merge diffbot-testing
remove coll.main.0/coll.conf
removed coll.conf