fix-merge-conflicts

Resolve git merge conflicts in dependency files, source code, and configuration. Use when merge conflicts are detected.

fix
merge
conflicts