finishing map
fixed merge
finished maps