implemented url history change
fixed merge conflict