macbook latest
merge conflicts