Correct small malfunctions due to indentations & 80 column wrapping
Resolved Conflicts