made git upstream changes more friendly