fixing merge styles & traduction2