modif loaded
modif loader
conflits fixed