small_conflict Created small conflict
master Merge conflict initiate
Resolved merge conflicts