fixed everything because git bash likes to put >>>>>>HEADER all over the place