Fix error caused by merge conflict.