Merging with sri:MacBook local