Merged controllers and Views (Some conflicts)