Resolve Copier conflicts and preserve project configuration

Signed-off-by: Tim Paine <3105306+timkpaine@users.noreply.github.com>

Author: timkpaine

Makefile

@@ -50,11 +50,7 @@ check-dist:  ## check python sdist and wheel with check-dist
 	check-dist -v
 
 check-types:  ## check python types with ty
-<<<<<<< before updating
-	ty check --python "$$(python -c 'import sys; print(sys.executable)')"
-=======
 	python -m ty check
->>>>>>> after updating
 
 checks: check-dist check-types