a3d52bc06ac32923484e6675938334b7 conflicts