Fixing the merge conflict.