Adding new controllers and views
Resolving conflict