update styles, titles
fix merge errors in post