fixing conflicting tools