fixed conflicts rendering bug