Fixed proof for 2
Resolved merge conflict