You should probably not configure your IDE to reorder imports automatically. This makes the diff hard to read in order to see what really has changes in terms of added / removed imports.