modif master to thest conflict