Conflicts:
	chrome.manifest
Update history topics