Sigh, remove diff markers