fix wrongly "rebased" files