How to resolve Merge Conflicts in Git using Command Line and UI