update views
fix merge error