Removing extraneous >>>>>> andrew