edit subject titles
fix conflict