Update view.php
my commit
conflict