new bullet written first but committed and pushed second
second bullet conflict resolved