merge mac changes