merged macbook with master