fix conflicts

Author: ayoubfaouzi

dotnet.go

@@ -724,11 +724,14 @@ func (pe *File) parseCLRHeaderDirectory(rva, size uint32) error {
 			table.Content, n, err = pe.parseMetadataMethodSpecTable(offset)
 		case GenericParamConstraint: // 0x2c
 			table.Content, n, err = pe.parseMetadataGenericParamConstraintTable(offset)
-
 		default:
 			pe.logger.Warnf("unhandled metadata table %d %s offset 0x%x cols %d",
 				tableIndex, MetadataTableIndexToString(tableIndex), offset, table.CountCols)
 		}
+		if err != nil {
+			pe.logger.Warnf("parsing metadata table %s failed with %v",
+				MetadataTableIndexToString(tableIndex), err)
+		}
 		offset += n
 
 	}

dotnet_metadata_tables.go

@@ -1195,7 +1195,7 @@ type AssemblyRefProcessorTableRow struct {
 
 // AssemblyRefOS 0x25
 type AssemblyRefOSTableRow struct {
-	OSPlatformId   uint32 `json:"os_platform_id"`   // a 4-byte constant
+	OSPlatformID   uint32 `json:"os_platform_id"`   // a 4-byte constant
 	OSMajorVersion uint32 `json:"os_major_version"` // a 4-byte constant
 	OSMinorVersion uint32 `json:"os_minor_version"` // a 4-byte constan)
 	AssemblyRef    uint32 `json:"assembly_ref"`     // an index into the AssemblyRef table

security.go

@@ -565,12 +565,12 @@ func parseAuthenticodeContent(content []byte) (AuthenticodeContent, error) {
 	if err != nil {
 		return AuthenticodeContent{}, err
 	}
-	hashFunction, algorithmId, err := parseHashAlgorithm(authenticodeContent.MessageDigest.DigestAlgorithm)
+	hashFunction, algorithmID, err := parseHashAlgorithm(authenticodeContent.MessageDigest.DigestAlgorithm)
 	if err != nil {
 		return AuthenticodeContent{}, err
 	}
 	return AuthenticodeContent{
-		Algorithm:    algorithmId,
+		Algorithm:    algorithmID,
 		HashFunction: hashFunction,
 		HashResult:   authenticodeContent.MessageDigest.Digest,
 	}, nil

version.go

@@ -372,9 +372,7 @@ func (pe *File) parseVersionEntry(e ResourceDirectoryEntry, vers map[string]stri
 				}
 			}
 		case VarFileInfoString:
-			break
 		default:
-			break
 		}
 
 		offset += uint32(f.Length)