Refactor
Conflict merge