confidence + inpainting general method
fix merge conflicts