Forgot BaseView
Adding merge conflict
Fixing specs