"Conflict resolved. Added new assign banner."