add inline mode for map reduce
resolve conflicts