Revert schema for merge