Removing the conflict