Remove pointless diff markers