Merge branches and add to point to proper mongo conf