merge changes to upstream repository