Map fix and merge cornflicts