s6 map updates
s6 merge