Working example
Resolved merge conflicts