merge conflict fix
mergeconf
Merge branch 'master' of github.com:Graborg/FindMyBike
merge conf fixed