Fixed merge coflict for real
Fucking DS_Store