Add untracked files
merge conflicts