Corrected merge conflicts

src/utils/Contexts/ContextIntersect.cpp

@@ -231,6 +231,8 @@ bool ContextIntersect::handle_b()
 		int fileId = getNumInputFiles() -1;
 		_dbFileIdxs.push_back(fileId);
 		_fileIdsToDbIdxs[fileId] = _dbFileIdxs.size() -1;
+		int dbFileIdx = getNumInputFiles() -1;
+		_dbFileIdxs.push_back(dbFileIdx);
 		markUsed(_i - _skipFirstArgs);
 		_i++;
 		markUsed(_i - _skipFirstArgs);

src/utils/RecordOutputMgr/RecordOutputMgr.cpp

@@ -377,6 +377,7 @@ void RecordOutputMgr::addDbFileId(int fileId) {
 	} else {
 		_outBuf.append(_context->getInputFileName(fileId));
 	}
+	_outBuf.append(fileId);
 	tab();
 }