removed merge detritus

fixed merge issues

fixed merge issues
Merge branch 'master' of github.com:cbechberger-rally/keystone