start formatting the views
resolved merge conflict