Merge Romaric, partie user