Basic setup to facilitate conflict
Eliminate idea and ds_store