stylezzz
ignore ds_store
merge resolution
clean up