Merge changes so branch is up to date