{"push_id":803062122,"size":2,"distinct_size":2,"ref":"refs/heads/master","head":"88d167cc256eb97bdbd0d498ca40bb7988be6b22","before":"d10680439f6f6fe8db5fbdf4fe96b482fbc53b23","commits":[{"sha":"ef1eda070a8051707cd0d5371917e78799857de1","author":{"email":"d3e3d9f4254f8468d0a871a9e97c8ea58296caa6@104.39.88.229","name":"WestBrian"},"message":"Merge conflict","distinct":true,"url":"https://api.github.com/repos/WestBrian/TowerDefense/commits/ef1eda070a8051707cd0d5371917e78799857de1"},{"sha":"88d167cc256eb97bdbd0d498ca40bb7988be6b22","author":{"email":"d3e3d9f4254f8468d0a871a9e97c8ea58296caa6@104.39.88.229","name":"WestBrian"},"message":"Merge origin/master\n\nConflicts:\n\tsrc/app.java","distinct":true,"url":"https://api.github.com/repos/WestBrian/TowerDefense/commits/88d167cc256eb97bdbd0d498ca40bb7988be6b22"}]}