objx updates
fixed conflict