headers package removed
HTML5-history package added
conflict resolved