# Conflicts: # app/controllers/general.php # app/controllers/shared/api.php # composer.json # composer.lock