adding more tools
merge conflict