The war between the United Kingdom and Scotland never ceased until this very day. 
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.