Removed .DS_Store
Fixing merge issues