update/copier_template868c56dc-dbcc-4fa1-973e-962d6aebbe9f
main
Resolve template update merge conflict