Forgot to merge tools. Manually merge the two branches