more or less done with the outline, now on to the detailed abstract
fixed merge conflicts