updated setup to 1.0.3, removed mergeTool2