getting changes merged