--- loncom/html/adm/help/tex/BridgeTask_About.tex	2007/05/10 17:31:44	1.2
+++ loncom/html/adm/help/tex/BridgeTask_About.tex	2007/05/30 15:36:15	1.3
@@ -2,6 +2,12 @@
 
 Bridge Tasks (BTs) are open-ended, performance-based assessments.  BTs are based on a mastery-model of assessment and evaluated on a pass-fail basis.  You may use BTs in a variety of ways, from supporting the scoring of a final project, to individual lab assignments. See Introduction to Bridge Task {\ref{BridgeTask_Intro}) for a more in-depth explanation to Bridge Tasks. The main features of a bridge task (\ref{BridgeTask_Features}) section gives the differences between BTs and other assessments.
 
+<<<<<<< BridgeTask_About.tex
+An author creates a bridge task either by writing the XML code or by using the edit mode.  The course coordinator must then place the Bridge Task resource on his/her course's document list. The section on Bridge Task Creation (\ref{BridgeTask_Create}) describes how to author as well as set up these Bridge Tasks.
+
+Once the bridge task is created and published, the course coordinator must insert the resource in the course's document list (See Setting Up a Bridge Task \ref{BridgeTask_SetupResource}). The course coordinator may also create slots to limit the place/time the bridge task may be opened (See Using Slots in Bridge Task \ref{BridgeTask_Slot}). This resource may also be placed inside conditionals resources so that it is accessible only after a particular condition has been met (see Bridge Task and Conditional Resources \ref{BridgeTask_Conditions}).  
+=======
 An author creates a bridge task either by writing the XML code or by using the edit mode and publishing it.  A course coordinator must then place the Bridge Task resource in his/her course's document list. The section on Bridge Task Creation (\ref{BridgeTask_Create}) describes how to author as well as set up these Bridge Tasks.      
+>>>>>>> 1.2
 
 Once the course coordinator has set up the Bridge Task the student is able to open and use the bridge task. A Bridge Task handin process using portfolio files may be used by the instructors or students if they wish (See Handing In Bridge Task Files \ref{BridgeTask_Portfolio})..