fixed conflicts with opt branch