Removed last bit of the conflict