fixes leftover conflict

TurTLE/test/collisions/stokes_rhs.hpp

@@ -43,7 +43,7 @@ class stokes_rhs: public abstract_particle_rhs
     public:
         stokes_rhs(){}
         ~stokes_rhs(){}
-        const int getStateSize() const
+        int getStateSize() const
         {
              // 3 numbers for position
              // // 9 numbers for components of deformation tensor                                                                                                                                                        // 3 numbers to store logarithmic factors