Auto growing map + fix session bug
resolve conflicts