f7aa0b3dffcafb71c973611653cc43d0 conflicts