Fixing merge oversight