We will understand below topics in this video -
1. What is Merge Conflict?
2. When do we get Merge Conflict?
3. Difference between changes and conflict
4. Resolve conflict using IntelliJ