Fix conflicts in files Tailor merged

Also some minor format edits
Added citations of conductance methods