User commands right this time ...
Fix merge conflicts.