Updated conflicts and remove Genre & top 100 link