worked on eligibility criteria to include drugs and other circumstances
merged conflicts