Ordering works!
Merge fixed a tiny conflict in map.js