Test conflit modif github