Ignore wiki repository.
Resolve conflict.
Remove wiki from repo.