add submodule for gpx parser
fix merge