merge work and mac changes