Update test2.php
test2 altered locally
conflict solved
conflict solved - remote file