Hi Padma,
I had the same issue as you, but found that if you attempt to resize the "white space" (using the mouse to bring up the arrow keys) the whole conflict becomes visible once more and you can click the "Keep All" or "Keep This" option once more to attempt to resolve the conflict. Thanks