small changes
fixed conflict