Resolving Merge Conflicts
Description
You've been working on a feature, and in the meantime, someone else changed the same line of code on the 'main' branch. It's time to merge, and you need to resolve the conflict.
Your Task
Switch to the 'main' branch and try to merge 'feature/conflicting-change'. A conflict will occur in 'config.js'. Resolve the conflict by keeping both changes, and then complete the merge.
Initial Files
theme: light
Requirements
- ▹Resolve the merge conflict in 'config.js' and complete the merge