bad merge
remove assignment files
track untracked files