[bpmedley]

Blank spaces are color coded so for easier detection, I can edit the file if I need to, and there are diffupdate commands for piecemeal merging of sections of the files.