minor changes
minor changes and resolved merge changes