Refactoring
Debugging
Fixing merging errors