How can she prevent this from happening again in all future promotions?

Debbie committed some changes to the Opportunity Layout but, after deploying her changes from DEV to INT, she found her changes were not there due to an auto-resolved Git conflict she was not aware of.

How can she prevent this from happening again in all future promotions?
A . Add Layout to the Exclude From Auto Resolve multi-select picklist field in the Pipeline record
B . Manually promote and remove Layout from the Exclude From Auto Resolve multi-select picklist field in the Promotion record.
C . Remove Layout from the Exclude From Auto Resolve multi-select picklist field in the Pipeline record.
D . Manually promote and add Layout to the Exclude From Auto Resolve multi-select picklist field in the Promotion rec

Answer: A