initial commit
knit to pdf
pdf version
resolve conflict