Solution for merge conflict
Solution for merge conflict

amigocloud/modified-tripplanner,amigocloud/modeify,amigocloud/modified-tripplanner,amigocloud/modified-tripplanner,amigocloud/modeify,amigocloud/modeify,amigocloud/modeify,amigocloud/modified-tripplanner