nothing I try is working..
fixed the merge
Merge branch 'master' of https://github.com/k8wells/452-2
trying with kate
fixed merge conflicts