Given following log snippets, their explanation, and nothing else, explain what failure, if any, occurred during build of this package.

  Snippets are in a format of [X] : [Y], where [X] is a log snippet, and [Y] is the explanation.

  Snippets are delimited with '================'.

  Drawing on information from all snippets, provide a concise explanation of the issue and recommend a solution.

  Explanation of the issue, and recommended solution, should take a handful of sentences.

  Snippets:

  [CONFLICT (content): Merge conflict in deploy/helm/flightctl/templates/flightctl-api-config.yaml
Auto-merging deploy/helm/flightctl/templates/flightctl-api-deployment.yaml
CONFLICT (content): Merge conflict in deploy/helm/flightctl/templates/flightctl-api-deployment.yaml
Auto-merging deploy/helm/flightctl/values.yaml
Automatic merge failed; fix conflicts and then commit the result.']: [During the merge process, conflicts were encountered in two files:
flightctl-api-config.yaml
flightctl-api-deployment.yaml
These conflicts happen when changes were made to the same lines in both the pull request and the current branch. Git cannot automatically decide which version to keep, so it requires manual intervention.]

Issue: The build failed because Packit is not able to merge pull request #681 into main.
Resolution: Fix Conflicts: Open the mentioned files (flightctl-api-config.yaml and flightctl-api-deployment.yaml) in a text editor. You'll see markers indicating the conflicting lines. You need to manually decide which version (from the pull request or the current branch) to keep for each conflict and adjust the file content accordingly.