edit testing index.php
edit test2 index.php
merge test2