@@ -2,11 +2,7 @@
  "cells": [
   {
    "cell_type": "code",
-<<<<<<< HEAD
    "execution_count": 2,
-=======
-   "execution_count": 1,
->>>>>>> 0c58d27a2b21bcdedb2b8400bc93f5ca628e9709
    "metadata": {
     "deletable": false,
     "editable": false
@@ -45,11 +41,7 @@
   },
   {
    "cell_type": "code",
-<<<<<<< HEAD
    "execution_count": 3,
-=======
-   "execution_count": 2,
->>>>>>> 0c58d27a2b21bcdedb2b8400bc93f5ca628e9709
    "metadata": {},
    "outputs": [],
    "source": [
@@ -84,11 +76,7 @@
   },
   {
    "cell_type": "code",
-<<<<<<< HEAD
    "execution_count": 4,
-=======
-   "execution_count": 3,
->>>>>>> 0c58d27a2b21bcdedb2b8400bc93f5ca628e9709
    "metadata": {
     "tags": [
      "otter_answer_cell"
@@ -109,33 +97,21 @@
   },
   {
    "cell_type": "code",
-<<<<<<< HEAD
    "execution_count": 5,
-=======
-   "execution_count": 4,
->>>>>>> 0c58d27a2b21bcdedb2b8400bc93f5ca628e9709
+
    "metadata": {
     "tags": [
      "otter_answer_cell"
     ]
    },
    "outputs": [
-    {
-<<<<<<< HEAD
-     "ename": "TypeError",
-     "evalue": "compute_prey_from_prey_and_predator() got an unexpected keyword argument 'prey'",
-     "output_type": "error",
-     "traceback": [
-      "\u001b[31m---------------------------------------------------------------------------\u001b[39m",
-      "\u001b[31mTypeError\u001b[39m                                 Traceback (most recent call last)",
-      "\u001b[36mCell\u001b[39m\u001b[36m \u001b[39m\u001b[32mIn[5]\u001b[39m\u001b[32m, line 18\u001b[39m\n\u001b[32m     14\u001b[39m \n\u001b[32m     15\u001b[39m prey_initial = \u001b[32m100\u001b[39m\n\u001b[32m     16\u001b[39m predator_initial = \u001b[32m100\u001b[39m\n\u001b[32m     17\u001b[39m \n\u001b[32m---> \u001b[39m\u001b[32m18\u001b[39m prey_new = compute_prey_from_prey_and_predator(prey=prey_initial, predator=predator_initial, params=params)\n\u001b[32m     19\u001b[39m \n\u001b[32m     20\u001b[39m print(f\"Checking prey new {prey_new}, should be 90\")\n",
-      "\u001b[31mTypeError\u001b[39m: compute_prey_from_prey_and_predator() got an unexpected keyword argument 'prey'"
-=======
+
+
      "name": "stdout",
      "output_type": "stream",
      "text": [
       "Checking prey new 90.0, should be 90\n"
->>>>>>> 0c58d27a2b21bcdedb2b8400bc93f5ca628e9709
+
      ]
     }
    ],