Fix bad conflict merging in RenderingProgressDialog