conflict Guillaume solved