Conflict Analysis & Resolution

"derset foldmethod=indent
"set fold