Merge OK de la classe user (Attention ;-))