New maps
Fixed conflicts