Fixed another merge conflict.