minor stuffs
confict fix

Conflicts:
	Project1/K0001002.DTA