fixed indentation guides
resolved merge conflicts
resolved merge conflicts