Formatting changes only
Resolved merge conflicts