resolve merge problem
Merge branch 'dev' of https://github.com/Clementp57/go-by-foot into dev