Changes merged