Issue 23853: Resolved conflicts