modify C.php
modify A.php
modify D.php
Manual merge feature/issue-2 into master