Resolved conflicts and removed .DS_Store from repo