Fixing conflicts in merging with upstream