merge changes with upstream since