[SQUASH ME] added a rationale msg on the conflict