Fix diff markers