add fix1
edit test1
del temp file
merge cr1 into master
merge fix 1
remove temp
add cr2.txt
merge with cr2