Finalize upgrading units, choosing units from JList, etc.
Fix merge