Resolve Conflict
Resolve Conflict
Refactoring