bring in changes i made from my local non-tracked copy