Fixing the conflict