isometric map part 2
fix conflicts