fix conflict.

src/utils/FileRecordTools/RecordOutputMgr.cpp

@@ -140,6 +140,7 @@ void RecordOutputMgr::printRecord(RecordKeyList &keyList) {
 		return;
 	}
     printRecord(keyList, NULL);
+
 }
 
 void RecordOutputMgr::printRecord(RecordKeyList &keyList, RecordKeyList *blockList)
@@ -208,7 +209,7 @@ void RecordOutputMgr::printRecord(RecordKeyList &keyList, RecordKeyList *blockLi
 		if (!printKeyAndTerminate(keyList)) {
 			tab();
 		}
-		_currBlockList = NULL;
+		_currBamBlockList = NULL;
 		return;
 	}
 }
@@ -433,4 +434,4 @@ void RecordOutputMgr::printKey(const Record *key)
 void RecordOutputMgr::flush() {
 	fwrite(_outBuf.c_str(), 1, _outBuf.size(), stdout);
 	_outBuf.clear();
-}
+}
\ No newline at end of file