Add untracked files.
Fix merge conflicts. Sorry in advance, David