Renamed controller to baseController added controller trait
Fixed merge conflicts