Issue edina/fieldtrip-osm#30 tidy up overlay dependencies
fix merge conflict