Corrected merge conflict.