Alexander? Patrick? m: Anne Mackie/McKie?

I'm trying to sort out an apparent conflict.
Some sources have
Patrick Hannay (son of John A'Hannay; 2g-grand-son of Odo) m: Anne Mackie/McKie
while others have
Alexander Hannay (son of Donald Hannay; 4g-grand-son of Odo) m: Anne Mackie/McKie

Numbers to the left are arbitrary generation numbers, so they do not match up.

http://www.thepeerage.com/p43102.htm#i431013http://www.thepeerage.com/p43102.htm#i431013
(You might have to search within the page on this site, the within-page anchors appear to change between visits.)
13. Odo A'Hannay of Sorbie (alive in 1420)
14. Donald Hannay of Sorbie (son of Odo A'Hannay of Sorbie) (alive in 1520)
15. Alexander A'Hannay 1st of Kirkdale (purchased Kirkdale in 1532)
16. John A'Hannay of Kirkdale
17. Patrick Hannay son of John (?Alexander Hannay? son of Donald) d: 1610-12-16 m: Anne Mackie (Anne Mackey, Anne McKee, Anne McKie) (daughter of Patrick McKie burgess of Wigtown & Margaret Stewart)
18. Patrick A'Hannay (son of Patrick A'Hannay of Kirkdale & Anne McKie) d: 1640 m: Agnes Dunbar (daughter of Gavin Dunbar of Baldoon & Janet Cunningham)
19. William Hannay of Kirkdale m: Elizabeth Gordon (daughter of Alexander Gordon of Castramont)
20. Samuel Hannay of Kirkdale m: Jean Mackie (daughter of sir Patrick Mackie of Larg & Agnes Mackie)
21. William Hannay of Kirkdale m: Margaret Johnston (daughter of reverend Patrick Johnston of Girthon)
18. Robert A'Hannay (son of Patrick A'Hannay of Kirkdale & Anne McKie) d: 1636 in Alsace
19. Robert A'Hannay b: c. 1630 d: 1682
20. Hugh A'Hannay b: 1666 d: 1738
21. Robert A'Hannay b: c. 1695 d: 1784 m: Janet McKie       http://www.thepeerage.com/p43104.htm#i431035

http://familytreemaker.genealogy.com/users/h/a/n/Harold-E-Hannah/ODT1-0001.html?Welcome=1079739606http://familytreemaker.genealogy.com/users/h/a/n/Harold-E-Hannah/ODT1-0001.html?Welcome=1079739606
& reverend James Arthur MacClannahan Hanna _Hanna of Castle Sorbie, Scotland..._
1. Patrick A'Hanna b: c. 1250?
2.. Gilbert De Annethe (A'Hanna) b: between 1265 & 1270?
3... John Hanna b: c. 1350?
4.... Gilbert Hanna
5.... . Andrew Hanna
6.... .. Odo Hannay [?Odo de Sorbie?]
7.... ... Robert Hannay
8.... .... Alexander Hannay
9.... .... . John Hannay [?m: Elizabeth Stewart (daughter of Sir Alexander Stewart & Elizabeth Douglas; grand-daughter of sir William Stewart & Elizabeth UNKNOWN and sir Archibald Douglas of Cavers; g-grand-daughter of sir John Stewart of Garlies & Marion Stewart; 2g-grand-daughter of sir Walter Stewart of Garlies & Dalswinton) (reported by Lundin records)?]
10.... .... .. Patrick Hannay
11.... .... ... Donald Hannay
12.... .... .... Alexander Hannay (son of Donald Hannah) m: Anne Mackie [Anne McKie?] (daughter of Patrick McKie burgess of Wigtown & Margaret Stewart)
13.... .... .... . Robert Hannay d: 1642
13.... .... .... . Patrick Hannay b: in Kirkdale, Scotlandd: 1629 at sea m: Angnes Dunnbar
14.... .... .... .. William Hannay b: in Kirkdale, Scotland m: Elizabeth Gordon
15.... .... .... ... Samuel Hannay b: in Kirkdale, Scotland m: Jane Mackie [Jane McKee?, Jane McKie?, Jean McKie?] (daughter of Patrick McKie & Mary MacDowall; grand-daughter of Alexander McKie & Katherine Agnew; g-grand-daughter of Patrick McKie burgess of Wigtown & Margaret Stewart)
16... .... .... .... William Hannay m: Margaret Johnston
12.... .... .... Robert Hanna (son of Donald Hannay; grand-son of Patrick Hannay; g-grand-son of John Hannay; 2g-grand-son of Alexander Hannay; 3g-grand-son of Robert Hannah; 4g-grand-son of Odo Hannay)
13.... .... .... . Robert Hanna
14.... .... .... .. Alexander Hanna (son of Robert Hanna; grand-son of Robert Hanna; g-grand-son of Donald Hannay; 2g-grand-son of Patrick Hannay; 3g-grand-son of John Hannay) b: c. 1600 in Galloway, Scotland d: 1640 in Northern Ireland...
15.... .... .... ... Robert Hanna b: in Scotland
16.... .... .... .... Robert Hanna b: in Scotland
17.... .... .... .... . James Hanna (son of Robert Hanna; grand-son of Robert Hanna; g-grand-son of Alexander Hanna; 2g-grand-son of Robert Hanna; 3g-grand-son of Robert Hanna; 4g-grand-son of Donald Hannay; 5g-grand-son of Patrick Hannay) b: 1718 in county Monaghan, Northern Ireland d: 1798 m: Martha UNKNOWN

http://www.bransoncook.systemaxonline.com/gedcoms/stewart/pafg02.htm#6044http://www.bransoncook.systemaxonline.com/gedcoms/stewart/pafg02.htm#6044
[Odo Hannay
Robert Hannay]
Alexander Hannay/Alexander Hannah
John Hannay (John Hannah) (son of Alexander Hannay/Alexander Hannah; [grand-son of Robert Hannay; g-grand-son of Odo Hannay]) d: 1544 in Sorbie, WigtownShire, Galloway, Scotland m: c. 1510 in Scotland to Margaret Stewart (daughter of Alexander Stewart) [?or m: c. 1500 to Elizabeth Stewart (daughter of Sir Alexander Stewart & Elizabeth Douglas; grand-daughter of sir William Stewart & Elizabeth UNKNOWN and sir Archibald Douglas of Cavers; g-grand-daughter of sir John Stewart of Garlies & Marion Stewart; 2g-grand-daughter of sir Walter Stewart of Garlies & Dalswinton) (reported by Lundin records)?]
Patrick Hannay (Patrick Hannah) (son of John Hannay & Margaret Stewart; grand-son of Alexander Hannay and Alexander Stewart) d: between 1581 & 1584 in Scotland
Donald Hannay (Donald Hannah) (son of Patrick Hannay/Patrick Hannah; grand-son of John Hannay & Margaret Stewart; g-grand-son of Alexander Hannay and Alexander Stewart) b: in Sorbie, WigtownShire, Galloway, Scotland d: 1620 in Sorbie, WigtownShire, Galloway, Scotland
Alexander Hannay (Alexander Hannah) (son of Donald Hannay/Donald Hannah; grand-son of Patrick Hannay/Patrick Hannah; g-grand-son of John Hannay & Margaret Stewart; 2g-grand-son of Alexander Hannay and Alexander Stewart) b: c. 1570 in Sorbie, WigtownShire, Galloway, Scotland d: 1612 in Sorbie, WigtownShire, Galloway, Scotland m: Anne McKie (Anne MacKie, Anne MacKey) (daugther of Patrick McKie/Patrick MacKie/Patrick MacKey) b: in Larg, WigtownShire, Galloway, Scotland
Patrick Hannay (Patrick Hannah)
http://www.bransoncook.systemaxonline.com/gedcoms/stewart/pafg05.htmhttp://www.bransoncook.systemaxonline.com/gedcoms/stewart/pafg05.htm

http://www.electricscotland.com/history/nation/hannay.htmhttp://www.electricscotland.com/history/nation/hannay.htm
1. Alexander Hannay
2.. John Hannay
3... Patrick Hannay of Kirkdale m: Ann Mackie (daughter of Patrick Mackie of Larg)
4.... Patrick Hannay of Kirkdale m: Agnes Dunbar (daughter of Gavin Dunbar of Baldoon)
5.... . William Hannay of Kirkdale m: Elizabeth Gordon (daughter of Alexander Gordon of Castranian/Castramont, a cadet of the family of Lochinvar afterwards viscounts Kenmuir)
6.... .. Samuel Hannay of kirkdale m: Jane Mackie (daughter of Patrick of Larg & Agnes;grand-daughter of sir Patrick Mackie of Larg)
7.... ... William Hannay of Kirkdale m: Margaret Johnston (daughter of reverend Patrick Johnston of Girthon)
8.... .... sir Samuel Hannay of Kirkdale m: 1768 to Mary Mead (daughter of Robert Mead)
9.... .... . sir Samuel Hannay b: 1772-08-12 d: 1841 (his home was scene of sir Walter Scott's _Guy Mannering_ and Dick Hatterick's _Cave_.)

Have I made obvious mistakes in transcription?

Does anyone have access to the original sources to help sort it out (I have only a few pages from the JAMHanna book)?

Is it a mix-up between the Sorbie line and the Kirkdale line?
Or at the junction betwixt them?