fix url infinite loop
fix merge conflicts