change in 2nd repo to cause conflict