Index: doc/user/user.tex
===================================================================
--- doc/user/user.tex	(revision c45170a282ebfb35f0ce6eec6cec991fe3531bb6)
+++ doc/user/user.tex	(revision 182fe1ec6f8ba5254e754ba3ba2dde6089336ee0)
@@ -10,7 +10,13 @@
 %% Author           : Peter A. Buhr
 %% Created On       : Wed Apr  6 14:53:29 2016
+<<<<<<< HEAD
 %% Last Modified By : Peter A. Buhr
 %% Last Modified On : Mon Aug  1 08:43:49 2016
 %% Update Count     : 1270
+=======
+%% Last Modified By : 
+%% Last Modified On : Sun Jul 31 07:27:55 2016
+%% Update Count     : 1254
+>>>>>>> 080615890f586cb9954c252b55cab47f52c25758
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
@@ -1795,5 +1801,5 @@
 and there is only a medium amount of fall-through from one ©case© clause to the next, and most of these result from a list of case values executing common code, rather than a sequence of case actions that compound.
 \end{itemize}
-These observations help to put the suggested changes to the ©switch© into perspective.
+These observations help to put the \CFA changes to the ©switch© into perspective.
 \begin{enumerate}
 \item
@@ -1805,5 +1811,9 @@
 still work.
 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 ) {
@@ -4359,4 +4369,9 @@
 
 
+\section{New Keywowrds}
+
+©catch©, ©catchResume©, ©choose©, \quad ©disable©, ©dtype©, \quad ©enable©, \quad ©fallthrough©, ©fallthru©, ©finally©, ©forall©, ©ftype©, \quad ©lvalue©, \quad ©otype©, \quad ©throw©, ©throwResume©, ©trait©, ©try©
+
+
 \section{Incompatible}