7th quote
resolved merge conflict
Resolved conflict 2nd time