add some views
fix merge conflict