ugit
ugit copied to clipboard
git status should show .unmerged paths
This will help in resolving merge conflicts.