#218 Updated mapreduce's query to return conflicts when specified in options.