Cleaned and rebased repositories. Now dealing with the consequences…