track untracked files
fix conflicts