a new change has been made
Resolved merge conflict.