changed drug report to focus on stocks
merged conflicts