add official map switch
conflicts fix