This is going to be a new release
Resolved merge conflict