Resolve merge conflict
More refactoring