adding some new things
fixed conflict