Changing package and methods
Refactoring
Fixing merge