change map ref to new default.
fix merge conflicts.