finale change to merge operation
-change modify to update in Controlers
Finally solved all conflict?