Fix map
Fix more merge conflicts.