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