Add View.Buffer()
Fixed merge conflict