Bug fixing and other
Refactoring
Improvements
Resolving conflicts