Merge resolved
divers ajouts