Added ours-all and theirs-all aliases + diff-conflicts