javascript map
merged conflicts