Fix Implicit Euler
Fix conflicts