add fix1
edit test1
del temp file
merge fix 1