Resolve conflict
Resolved merge conflicts