diff --git a/src/symba/symba_frag_pos.f90 b/src/symba/symba_frag_pos.f90
index 7c7578675..a59ef0fe6 100644
--- a/src/symba/symba_frag_pos.f90
+++ b/src/symba/symba_frag_pos.f90
@@ -350,7 +350,12 @@ subroutine symba_frag_pos_kinetic_energy(m_frag, ke_target, L_target, x_frag, v_
       logical,                  intent(out)   :: lmerge
 
       ! Internals
+<<<<<<< HEAD
       integer(I4B)                          :: i,  neval
+=======
+      real(DP)                              :: mtot           !! Total mass of fragments
+      integer(I4B)                          :: i, nfrag, neval
+>>>>>>> Fragmentation
       real(DP), parameter                   :: TOL = 1e-12_DP
       real(DP), dimension(:), allocatable   :: vflat
       logical                               :: lerr
diff --git a/src/util/util_minimize_bfgs.f90 b/src/util/util_minimize_bfgs.f90
index dc11dc5f3..cdc09cf49 100644
--- a/src/util/util_minimize_bfgs.f90
+++ b/src/util/util_minimize_bfgs.f90
@@ -27,8 +27,13 @@ function util_minimize_bfgs(f, N, x0, eps, lerr) result(x1)
    real(DP), dimension(:), allocatable :: x1
    ! Internals
    integer(I4B) ::  i, j, k, l, conv, num, fnum
+<<<<<<< HEAD
    integer(I4B), parameter :: MAXLOOP = 100 !! Maximum number of loops before method is determined to have failed 
    real(DP), parameter     :: gradeps = 1e-5_DP !! Tolerance for gradient calculations
+=======
+   integer(I4B), parameter :: MAXLOOP = 2000 !! Maximum number of loops before method is determined to have failed 
+   real(DP), parameter     :: gradeps = 1e-4_DP !! Tolerance for gradient calculations
+>>>>>>> Fragmentation
    real(DP), dimension(N) :: S               !! Direction vectors 
    real(DP), dimension(N) :: Snorm           !! normalized direction 
    real(DP), dimension(N,N) :: H             !! Approximated inverse Hessian matrix