Pulling Upstream Changes and Fixing Merge