resolved conflict with main.tex
2.1. completed (consider adding more figures)