some changes
some thing s
conflict fixed