a couple of changes
fixed conflict