fixed file merge error