resolved http://
some diff confl