Refactoring packages
Removing refactored classes
Removing conflicting/duplicate jar packages
Merging changes