ignore config.php
resolved conflict