First merge is conflict-prone

[pkgw]

Need to be more explicit to people about where to add the lines to print their names and print the fp rate so that there's no danger of a conflict.