Fix conflicts issue