Resolve conflicts by integrating changes from both sides.
Attach a file by drag & drop or click to upload
