Update README.md

README.md

@@ -1,12 +1,9 @@
-<<<<<<< HEAD
-=======
 ---
 license: mit
 language:
 - en
 pipeline_tag: question-answering
 ---
->>>>>>> 8f336f8225704206d8ba2ab4e229f71676bdcf0e
 The evaluation of this project is to answer trivia questions.  You do
 not need to do well at this task, but you should submit a system that
 completes the task or create adversarial questions in that setting.  This will help the whole class share data and
@@ -336,8 +333,4 @@ The final three areas are different between the system and the questions.
 | _Effort_ |  Did you do what you say you would, and was it the right ammount of effort.  | Are the questions well-written, interesting, and thoroughly edited? |
 | _Performance_ | How did your techniques perform in terms of accuracy, recall, etc.? | Is the human accuracy substantially higher than the computer accuracy? |
 
-<<<<<<< HEAD
 All members of the group will receive the same grade.  It's impossible for the course staff to adjudicate Rashomon-style accounts of who did what, and the goal of a group project is for all team members to work together to create a cohesive project that works well together.  While it makes sense to divide the work into distinct areas of responsibility, at grading time we have now way to know who really did what, so it's the groups responsibility to create a piece of output that reflects well on the whole group.
-=======
-All members of the group will receive the same grade.  It's impossible for the course staff to adjudicate Rashomon-style accounts of who did what, and the goal of a group project is for all team members to work together to create a cohesive project that works well together.  While it makes sense to divide the work into distinct areas of responsibility, at grading time we have now way to know who really did what, so it's the groups responsibility to create a piece of output that reflects well on the whole group.
->>>>>>> 8f336f8225704206d8ba2ab4e229f71676bdcf0e