fixed merge conflict
Merge branch 'master' of github.com:lizardsystem/lizard-elevationprofile