Fix conflicts issues