.DS files being a pain
Fixing merge issues