merge the changes into dev