Merge Preview Fixes