Change in article controller and in some models
conflict solved