When depickme-ing, only requeue pickmes that conflict-pickme
Add tests
Merge pull request #80 from rschlaikjer/requeue-only-conflicting-pickmes

When depickme-ing, only requeue pickmes that conflict-pickme