Filtering for Vid and Pid in findAll()
Unneeded lines deleted
Merge conflicts solved