add titles
fix merge error