I have no experience with EFI stuff, but i can recommend to use the Timeshift GUI and not the CLI mode for a restore. The GUI gives side by side a compare Window, which partitions it wants to overwrite… it should be pretty clear after that.
I hope you have a fresh snapshot and don’t restore a old snapshot… otherwise you could face even more issues.
If you have created a fresh snapshot right before you playing around with this pacnew files, then everything should be fine.
You have 2 options, restore your snapshot (recommend to use GUI) or just open dolphin and click on “modified” to list the last modified files first, at /etc/
You may can open Dolphin to get a overview and copy+paste manually the old unmerged files (Timeshift backup files), to get it working again.
This sounds to me like this file:
/etc/passwd
Check for recently modification and maybe replace it.
This pacnew file showed up in February this year.
Edit:
If im right and it is this file and you want still assist or need more infos to Merge this file.
Look at the comments in the annoucement Topic from February:
or this here: