{"push_id":557744763,"size":1,"distinct_size":1,"ref":"refs/heads/master","head":"72689e7743f41ac6bbbdd77cb5be604e425adf84","before":"2ba32c74ff0dfabd34db56bf34f2841ec5d25d44","commits":[{"sha":"72689e7743f41ac6bbbdd77cb5be604e425adf84","author":{"email":"dcab2065d59495532bbce07c9af6c778f6afe178@mcs-macbook-pro.gateway.2wire.net","name":"mc"},"message":"merge conflict resolved between branches","distinct":true,"url":"https://api.github.com/repos/mmconrad/CloudBalance/commits/72689e7743f41ac6bbbdd77cb5be604e425adf84"}]}