merges rosie changes