tom:modify b.php
solve conflict