2 divs
jacks endelss list
conflict resolved
organos files
orig. file
removed orig file