Adding test.php
Test commit.
Test BERTO branch commmit.
Merge update
Testing built-in mergetool