Follow-up to bf09fbc75421ef1a3cc02754191a5b791118f679

Fixed conflict errors