minor changes
Resolved merge conflicts