remove some diff markers that somehow got in here