Fix problems caused by merge conflict.