{"action":"created","issue":{"url":"https://api.github.com/repos/ViDA-NYU/domain_discovery_tool/issues/30","labels_url":"https://api.github.com/repos/ViDA-NYU/domain_discovery_tool/issues/30/labels{/name}","comments_url":"https://api.github.com/repos/ViDA-NYU/domain_discovery_tool/issues/30/comments","events_url":"https://api.github.com/repos/ViDA-NYU/domain_discovery_tool/issues/30/events","html_url":"https://github.com/ViDA-NYU/domain_discovery_tool/issues/30","id":104575511,"number":30,"title":"seeds_generator/conf/queries.txt creates Merge Conflicts","user":{"login":"brittainhard","id":5440553,"avatar_url":"https://avatars.githubusercontent.com/u/5440553?v=3","gravatar_id":"","url":"https://api.github.com/users/brittainhard","html_url":"https://github.com/brittainhard","followers_url":"https://api.github.com/users/brittainhard/followers","following_url":"https://api.github.com/users/brittainhard/following{/other_user}","gists_url":"https://api.github.com/users/brittainhard/gists{/gist_id}","starred_url":"https://api.github.com/users/brittainhard/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/brittainhard/subscriptions","organizations_url":"https://api.github.com/users/brittainhard/orgs","repos_url":"https://api.github.com/users/brittainhard/repos","events_url":"https://api.github.com/users/brittainhard/events{/privacy}","received_events_url":"https://api.github.com/users/brittainhard/received_events","type":"User","site_admin":false},"labels":[],"state":"open","locked":false,"assignee":null,"milestone":null,"comments":3,"created_at":"2015-09-02T21:30:17Z","updated_at":"2015-09-02T22:16:29Z","closed_at":null,"body":"Does this file need to be tracked by the repo? My PR at https://github.com/ViDA-NYU/domain_discovery_tool/pull/28 just got a merge conflict because of a merged change in this file."},"comment":{"url":"https://api.github.com/repos/ViDA-NYU/domain_discovery_tool/issues/comments/137261126","html_url":"https://github.com/ViDA-NYU/domain_discovery_tool/issues/30#issuecomment-137261126","issue_url":"https://api.github.com/repos/ViDA-NYU/domain_discovery_tool/issues/30","id":137261126,"user":{"login":"aecio","id":150570,"avatar_url":"https://avatars.githubusercontent.com/u/150570?v=3","gravatar_id":"","url":"https://api.github.com/users/aecio","html_url":"https://github.com/aecio","followers_url":"https://api.github.com/users/aecio/followers","following_url":"https://api.github.com/users/aecio/following{/other_user}","gists_url":"https://api.github.com/users/aecio/gists{/gist_id}","starred_url":"https://api.github.com/users/aecio/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/aecio/subscriptions","organizations_url":"https://api.github.com/users/aecio/orgs","repos_url":"https://api.github.com/users/aecio/repos","events_url":"https://api.github.com/users/aecio/events{/privacy}","received_events_url":"https://api.github.com/users/aecio/received_events","type":"User","site_admin":false},"created_at":"2015-09-02T22:16:29Z","updated_at":"2015-09-02T22:16:29Z","body":"I think you can go ahead. The app rewrites the content of this file everytime a new web search is issued."}}