modif map 6
merge