fixed inserted bug
fixed conflict