changed assets url to use https
merge conflict resolved