update views
resolved merge