Use smerge minor mode in emacs to resolve conflicts.
The condition-case is used to suppress errors with emacs versions before 21.
% basic
% unknown
*** [alias] unknown: command bargle is unknown
% ambiguous
*** [alias] ambiguous: command s is ambiguous
% recursive
*** [alias] recursive: circular dependency on recursive
adding foo
% with opts
C foo