Conflict Resolution The RSS way