Show/hide conflicts of one type
Cut/Delete commands
Merge with develop-branch.