Rebase version up to 1.25 && Cleaning da house