fresh
update
merge
I need to ignore DS_Store
premerge
resolve conflicts