added rake version update
fixed conflicts