merge imac work and master