test
commit test.php
commit master branch test.php file
resolved conflict