Fix merge stuff
Fix mac declaration