You can merge multiple proposals into one proposal. If a proposal is free of conflicts, it can be merged with the master. The proposal or master that you merge with the current proposal remains unchanged.
After a merge, proposed features from the selected proposal appear in the current proposal. If any of the features conflict, the conflicts are outlined in red. To delete the conflicts, select the relevant features and press Delete.
All proposals (other than the active proposal) are listed, as well as the master (base model).