prepping for mongodb loading
resolve merge conflicts