Index: doc/user/user.tex
===================================================================
--- doc/user/user.tex	(revision d1fbaa78c3580dc1cc1caaafd0f9ed1a1c5438b1)
+++ doc/user/user.tex	(revision fe7b2813d03264d9b965f970e992ee6bdef2a432)
@@ -11,6 +11,6 @@
 %% Created On       : Wed Apr  6 14:53:29 2016
 %% Last Modified By : Peter A. Buhr
-%% Last Modified On : Sun Aug 14 08:23:06 2016
-%% Update Count     : 1323
+%% Last Modified On : Thu Sep 29 11:50:28 2016
+%% Update Count     : 1325
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
@@ -33,4 +33,5 @@
 \usepackage{textcomp}
 \usepackage[latin1]{inputenc}
+
 \usepackage{fullpage,times,comment}
 \usepackage{epic,eepic}
@@ -1853,11 +1854,7 @@
 case 1:  case 2:  case 3: ...
 \end{lstlisting}
-still work.
+still works.
 Nevertheless, reversing the default action would have a non-trivial effect on case actions that compound, such as the above example of processing shell arguments.
-<<<<<<< HEAD
-Therefore, to preserve backwards compatibility, it is necessary to introduce a new kind of ©switch© statement, called ©choose©, with no implicit fall-through semantics and an explicit fall-through if the last statement of a case-clause ends with the new keyword ©fallthru©, \eg:
-=======
 Therefore, to preserve backwards compatibility, it is necessary to introduce a new kind of ©switch© statement, called ©choose©, with no implicit fall-through semantics and an explicit fall-through if the last statement of a case-clause ends with the new keyword ©fallthrough©/©fallthru©, e.g.:
->>>>>>> 080615890f586cb9954c252b55cab47f52c25758
 \begin{lstlisting}
 ®choose® ( i ) {