changes merged