New Removed Modified ConflictsLaunch Merge ToolMark as Resolved