On 1 May 1707 England and Scotland were formally joined together by the  Act of Union  establishing the Union of Parliaments and the United Kingdom was born.
When the fighting stopped and the union was established, Scotland and the UK finally joined together and made up.