# Conflict
<a name="API_Conflict"></a>

Information about conflicts in a merge operation.

## Contents
<a name="API_Conflict_Contents"></a>

 ** conflictMetadata **   <a name="CodeCommit-Type-Conflict-conflictMetadata"></a>
Metadata about a conflict in a merge operation.  
Type: [ConflictMetadata](API_ConflictMetadata.md) object  
Required: No

 ** mergeHunks **   <a name="CodeCommit-Type-Conflict-mergeHunks"></a>
A list of hunks that contain the differences between files or lines causing the conflict.  
Type: Array of [MergeHunk](API_MergeHunk.md) objects  
Required: No

## See Also
<a name="API_Conflict_SeeAlso"></a>

For more information about using this API in one of the language-specific AWS SDKs, see the following:
+  [AWS SDK for C\$1\$1](https://docs.aws.amazon.com/goto/SdkForCpp/codecommit-2015-04-13/Conflict) 
+  [AWS SDK for Java V2](https://docs.aws.amazon.com/goto/SdkForJavaV2/codecommit-2015-04-13/Conflict) 
+  [AWS SDK for Ruby V3](https://docs.aws.amazon.com/goto/SdkForRubyV3/codecommit-2015-04-13/Conflict)