Resolve merge conflict
Resolve conflict