tftpd: fix wrong conflict resolution
This is direct commit to stable/13 after wrong previous one.
Fixes: b71dde1aeba2972522a6742bbae77c2c6497eb01