Refactor
Resolve merge conflicts