review implemented
fixed conflicts