Fix Zoopla font
Fix merge conflicts