Some changes
Resolved merge conflict