Add a full_title helper
fix merge conflicts