remove filemerge line mistake