Distributed MapReduce compiles
fixed merge conflicts