ok map
conflicts solved