Merge Paranoid Changes