remote connect
...
Merge remote-tracking branch 'origin/master'
edit index.php