added items to maps
fixed merge