To merge master into branch