Some weird merge error happened. Fixed it maybe
Forgot to push my new view.