Which recipe does it conflict with? Can you add a comment to the move operation about the conflict?
mentioned in commit 095f0d07
merged
