.DS_STORE
conflict fix
0.03 explanation