delete conflicting part