Fixes some conflicts.
Updates gitignore and removes unneeded files.