Resolve merge
Resolved merge