merge changes into branch