ef2d3bf1e989237bfaa187573e1bfefd conflicts