style updates
fixed conflict