Conflict resolutions:
- composer.lock: regenerated via composer update
- Language/**/Config.php (10 files): kept branch's table_polling_frequency_*
keys; took master's removal of English placeholders in non-EN locales
- Controllers/Customers.php: kept branch's batch-queue import body; applied
master's getInfo/saveCustomer PSR renames to surrounding methods
- Jobs/Support/CustomerCsvRowProcessor.php: save_customer → saveCustomer
(PSR rename from master, missed by auto-merge)
- Models/Stock_location.php: took all master PSR renames and new
setDefaultLocation/saveSortOrder/sort_order logic; re-applied branch's
?int $personId = null param to getUndeletedAll and get_allowed_locations
Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>