Fixed merge fail.