How to Resolve Git Merge Conflict: Explained in Detail