some changes
some changes of head
conflict fixed