Fixed the merge conflict.