Some changes
Resolved merge conflicts