Merge tidyall changes.