made a possibly conflicting change in another git copy