Delete redundant files.
Edit .gitignore.
Resolve merge conflicts