Here's the logs while doing update, I have previously modified the email template in these files, not sure if this is the case
tail -f /var/log/apache2/error.log
[Sun Feb 02 11:55:49.999478 2025] [core:notice] [pid 2722] AH00094: Command line: '/usr/sbin/apache2'
error: Your local changes to the following files would be overwritten by merge:
cron_ticket_email_parser.php
guest_post.php
login.php
post/user/invoice.php
post/user/ticket.php
Please commit your changes or stash them before you merge.
Aborting
[Sun Feb 02 11:55:56.872995 2025] [php:warn] [pid 2724] [client 172.69.68.107:22602] PHP Warning: Undefined variable $comments in /var/www/mydomain.com/post/admin_update.php on line 206, referer: https://mydomain.com/admin_update.php