fix conflict in main.php