Local map merge back to master