moves and misfit to txt
merge conflict