added final modifyer to InvertedFileMerger (automatically done by eclipse)
conflict resolution, final added