cleanup of merge, tested new tool. wrong decision