2.5.2 conflict fix