1 and 2

julia/run.jl

@@ -6,12 +6,7 @@ in the blanks, but most parts of the code are very similar."""
 for (name,op) in [(:add, :+), (:sub, :-), (:mul, :*)]
   # Create a function that is named for example add and returns the
   # sum of its two arguments
-<<<<<<< HEAD
-  @eval $name(x,y) = $op(x,y)
-=======
-   @eval Base.$name(x,y) = x + y
->>>>>>> 4a75a26d8d533e43444e1ecae6617eea7e575123
-  
+   @eval $name(x,y) = $op(x,y) 
 end