fix merge error
fix merge error
update views