fixed conflicts with a bad merge