local change while someone pushes to develop