modiyfy2
	modified:   1.js
conflict resolve