[BUG] <title>Unable to re-retrieve assets that have merge conflict

[anaema94]

Is there an existing issue for this?

• I have searched the existing issues

Current Behavior

When we encounter a merge conflict in one file the git adds lines into the file itself for incoming changes and current changes.
In order to have the latest version in git and to solve merge conflicts I am doing a re-retrieval of those assets but this fails with error: Retrieveing asset failed: Cannot read properties of undefined (reading 'customerkey')
workaround is to re-retrieve all assets, in this case the error is not present.

See the screenshots:

Expected Behavior

Re-retrieval works not only for all assets but also for those with merge conflict.

Steps To Reproduce

1. Go to '...'
2. Click on '....'
3. Run '...'
4. See error...

Version

9.0.2

Environment

• OS:
• Node:
• npm:

Participation

• I am willing to submit a pull request for this issue.

Additional comments

No response