bug epsilon
resilu probleme merge