add controller
Merge index.php conflict