Removed Topics/Conflict
Re-added topics with revised/non-conflicting name
Resolved conflicts.