add missed conflict