Pulling most recent changes and merging them.
ignored .DS_Store dir