Correcting the merge conflict.