Fix to clean up a missed conflict.