Fix merge conflict.