upload major components
resolve conflicts