Completed X/Y/zoom in URL
Fixed conflicts
Fixed conflicts