fix conflict was not updated