merge tanulas
ConterntController.php conflict resolve