fl ict in src/Controller/UserController.php Auto-merging src/Controller/OrderController.php CONFLICT (content): Merge con fl ict in src/Controller/OrderController.php Auto-merging src/Model/InvoiceModel.php CONFLICT (content): Merge con fl ict in src/Model/InvoiceModel.php Auto-merging src/Model/ProductModel.php CONFLICT (content): Merge con fl ict in src/Model/ProductModel.php Auto-merging templates/layout/header.php CONFLICT (content): Merge con fl ict in templates/layout/header.php ...