merged local changes with upstream changes