after conflict,add something.