Little update
merge conflicts handle
map returned