fixing url for master
only show required symbol if required
resolving merge conflict