How to Resolve Merge Conflicts in Git? - Scaler Topics