fix collab width
fix probleme de merge