"Merging with mac"
fixing merge conflicts