updating views & merging w bryan