#34 - Ticket page [theme]: fix merge conflict