Much shorter
resolved merge conflict