update views
fix merge errors