merged her changes