Fix 2 derpmerges