Fix to merge fail.