fix missing conflict