Fix conflicts2