{"push_id":3124927088,"size":3,"distinct_size":1,"ref":"refs/heads/master","head":"c5d960e7f9e971d96ebf694aa838aaba5fbbdc8c","before":"bad918619232c8b5fbcc194d59e7e7b465cb575b","commits":[{"sha":"90ba1937d1508c93e09c7e948ef342a4133ef29a","author":{"name":"GitHub Teacher","email":"6ab9c4b76037c547516cb30bc54710e0b0ff7b81@github.com"},"message":"Add GitHub Teacher info to config file","distinct":false,"url":"https://api.github.com/repos/butter02/merge-conflict/commits/90ba1937d1508c93e09c7e948ef342a4133ef29a"},{"sha":"185905c88106da12fa6b81d5cad311bf9bc24a5c","author":{"name":"butter02","email":"c3597b9c02fdfc3aa12b36ebc320872ba5227047@users.noreply.github.com"},"message":"Merge branch 'master' into update-config","distinct":false,"url":"https://api.github.com/repos/butter02/merge-conflict/commits/185905c88106da12fa6b81d5cad311bf9bc24a5c"},{"sha":"c5d960e7f9e971d96ebf694aa838aaba5fbbdc8c","author":{"name":"butter02","email":"c3597b9c02fdfc3aa12b36ebc320872ba5227047@users.noreply.github.com"},"message":"Merge pull request #2 from butter02/update-config\n\nSecond merge: Let's try a conflict","distinct":true,"url":"https://api.github.com/repos/butter02/merge-conflict/commits/c5d960e7f9e971d96ebf694aa838aaba5fbbdc8c"}]}
{"actor":{"display_login":"butter02"}}