base strucuture chane, style change, url change
conflict resolved