Commits with conflicts might need an extra eye. I've been careful with them nonetheless :-)
BUG: 425011