Use cases
Resolved merge conflict