Merge conflict from script-correlation-r fixed (detected at compilation time)