correction gem
fixed conflicts