added an issues handler
merged conflicts