resolve conflicts for bug #23712 and #23713