bugs fixe
conflicts