Add a full_title helper
Fix conflicts