{"comment":{"url":"https://api.github.com/repos/HardenedBSD/hardenedBSD/comments/12209377","html_url":"https://github.com/HardenedBSD/hardenedBSD/commit/f0dc872a4dea5bbd6f981e1cf785ccbe46127e1e#commitcomment-12209377","id":12209377,"user":{"login":"opntr","id":2576589,"avatar_url":"https://avatars.githubusercontent.com/u/2576589?v=3","gravatar_id":"","url":"https://api.github.com/users/opntr","html_url":"https://github.com/opntr","followers_url":"https://api.github.com/users/opntr/followers","following_url":"https://api.github.com/users/opntr/following{/other_user}","gists_url":"https://api.github.com/users/opntr/gists{/gist_id}","starred_url":"https://api.github.com/users/opntr/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/opntr/subscriptions","organizations_url":"https://api.github.com/users/opntr/orgs","repos_url":"https://api.github.com/users/opntr/repos","events_url":"https://api.github.com/users/opntr/events{/privacy}","received_events_url":"https://api.github.com/users/opntr/received_events","type":"User","site_admin":false},"position":null,"line":null,"path":"","commit_id":"f0dc872a4dea5bbd6f981e1cf785ccbe46127e1e","created_at":"2015-07-16T18:11:27Z","updated_at":"2015-07-16T18:11:27Z","body":"Shawn: could you please at least mark the conflicting file in these commits? Or much better to fix the conflict in different commit."}}