Update test_plan.tex

Resolved conflicts