Reformat plan form
Dynamic activity forms
Resolved conflicts