for people that got a test template PR and (tried to) merge(d) it, can you have a quick look at the common conflict resolution tutorial here: https://github.com/nf-core/website/pull/4189

couple of small comments