Added link for changing the distribution for the map
Fixed conflicts