# Conflicts: # app/Admin/Controllers/CouponTieController.php # app/Admin/bootstrap.php # dcat_admin_ide_helper.php