adding void around maps
fixing merge