Conflict Resolution selection was broken after being moved outside its previous container

Testing Done:
Issue Number:
Approved by:
Reviewed by: