updated the last merge snafu

removed margins and header