Adds diffconflicts and updates gitignore.