Fixed bug in retry with chosing maps
Fixed merge conflicts