Fixed mangled merge.