fixing merge conflict by adding in a new tool, but preserving the original intent of categorizing the tools