code review changes
fixed conflict