Remove another conflict