2nd merge commit
Resolved merge conflict