field updates
fixed conflict