Fix merge conflicts in /maps