fix subject view
fix conflict