Mac tweaks
merge pull conflict