Add title previews for custom heroes
Fix merge conflict