fix file case
merge