Refactoring...
Resolving conflicts