{"push_id":734191691,"size":1,"distinct_size":1,"ref":"refs/heads/Section_Conflict_Resolution","head":"88ec8b13f7211916c4cf049a7afffa2a90e5d6b5","before":"f282b7cabb7e1510767951bff6752a55ebeb09c7","commits":[{"sha":"88ec8b13f7211916c4cf049a7afffa2a90e5d6b5","author":{"email":"f42ed9f9f0cc118314f6178f793a8999c0b88fd4@gmail.com","name":"Sphe Malo"},"message":"Conflict resolution functionality partially completed","distinct":true,"url":"https://api.github.com/repos/SpheMalo/COS-301-Main-Project/commits/88ec8b13f7211916c4cf049a7afffa2a90e5d6b5"}]}