This will be mergeable now, and resolves the would-be conflict with the map.