merge
a
macos complier problems