Additional resolution of previous merge