Raptor : merge (conflit stid vs. stop_time_idx)
Raptor : merge (conflit stid vs. stop_time_idx)

frodrigo/navitia,francois-vincent/navitia,djludo/navitia,antoine-de/navitia,CanalTP/navitia,frodrigo/navitia,patochectp/navitia,francois-vincent/navitia,TeXitoi/navitia,Tisseo/navitia,kadhikari/navitia,Tisseo/navitia,fueghan/navitia,ballouche/navitia,CanalTP/navitia,kadhikari/navitia,kadhikari/navitia,stifoon/navitia,xlqian/navitia,datanel/navitia,VincentCATILLON/navitia,xlqian/navitia,thiphariel/navitia,xlqian/navitia,thiphariel/navitia,kadhikari/navitia,francois-vincent/navitia,thiphariel/navitia,datanel/navitia,datanel/navitia,stifoon/navitia,stifoon/navitia,CanalTP/navitia,prhod/navitia,is06/navitia,datanel/navitia,ballouche/navitia,is06/navitia,is06/navitia,xlqian/navitia,VincentCATILLON/navitia,fueghan/navitia,kinnou02/navitia,pbougue/navitia,xlqian/navitia,TeXitoi/navitia,antoine-de/navitia,patochectp/navitia,kinnou02/navitia,lrocheWB/navitia,patochectp/navitia,ballouche/navitia,djludo/navitia,VincentCATILLON/navitia,antoine-de/navitia,kinnou02/navitia,fueghan/navitia,lrocheWB/navitia,frodrigo/navitia,antoine-de/navitia,is06/navitia,stifoon/navitia,TeXitoi/navitia,pbougue/navitia,Tisseo/navitia,djludo/navitia,kinnou02/navitia,fueghan/navitia,francois-vincent/navitia,Tisseo/navitia,prhod/navitia,thiphariel/navitia,pbougue/navitia,ballouche/navitia,CanalTP/navitia,djludo/navitia,patochectp/navitia,VincentCATILLON/navitia,lrocheWB/navitia,CanalTP/navitia,Tisseo/navitia,prhod/navitia,pbougue/navitia,TeXitoi/navitia,prhod/navitia,lrocheWB/navitia,frodrigo/navitia