Removed vedad folder.
Added link to Vedad repo.
Fixed conflict.