How do I upload plans and resolve version conflicts?