Well, so far I haven't noticed the 'auto-merge' auto-merging. I still have to manually do fleet cat herding.
There's still plenty of realestate on the unit popup for an automerge on/off toggle, and certainly one could be placed in the trade popup.
More generally, the more options there are to customize unit behavior, the better. If realestate is a problem, have a popup expansion popup next to the unit popup so unit behavior can be refined.
For example, trading ships being pounced upon by prepositioned warships. Have options for fleet behavior that include 'Flee!', that way those fast ships will simply run away instead of engaging in hopeless combat.
There's still plenty of realestate on the unit popup for an automerge on/off toggle, and certainly one could be placed in the trade popup.
More generally, the more options there are to customize unit behavior, the better. If realestate is a problem, have a popup expansion popup next to the unit popup so unit behavior can be refined.
For example, trading ships being pounced upon by prepositioned warships. Have options for fleet behavior that include 'Flee!', that way those fast ships will simply run away instead of engaging in hopeless combat.