pre-pull, post-add commit :D
conflict on test code
pre-pull commit
Fixed some conflicts, pulling again
pre-pull commit, changed extrinsic_testing so that it will take the max confidence of all fingerprinting methods
fixed conflicts, everything runs.