transformed draft on google docs into latex
merged conflict