merge modifications for final presentation