cleaned up some comments

DA.sv

@@ -48,7 +48,6 @@ always_ff@(posedge ck, posedge rst)
 
 
 // ==== DA accumulator ==== 
-<<<<<<< HEAD
 always_ff @(posedge ck)
   if (reset_accumulator)
   begin
@@ -68,28 +67,6 @@ always_ff @(posedge ck)
         begin
             shifted_out <= {partial_sum[0], shifted_out[N-1:1]};     									  
             partial_sum <= {partial_sum[(N-1)+8],partial_sum[(N-1)+8:1]} - multiplication_coefficients[multiplication_addresses[address]]; 
-=======
-always_ff @(posedge ck, posedge rst)
-    if (reset_accumulator)
-    begin
-        partial_sum <= '0;
-        shifted_out <= '0;
-    end
-    else
-    begin
-        if(compute)
-        begin 
-            if(address < N-1)
-            begin
-                shifted_out <= {partial_sum[0], shifted_out[N-1:1]};     									 
-                partial_sum <= {partial_sum[(N-1)+8],partial_sum[(N-1)+8:1]} + multiplication_coefficients[multiplication_addresses[address]]; 
-            end
-            else
-            begin
-                shifted_out <= {partial_sum[0], shifted_out[N-1:1]};     									  
-                partial_sum <= {partial_sum[(N-1)+8],partial_sum[(N-1)+8:1]} - multiplication_coefficients[multiplication_addresses[address]]; 
-            end
->>>>>>> c3e2c38a62bbbf0555b4b676ad01f703f9b1ee10
         end
     end
 // ==== DA accumulator ====