favicons
fix merge