Fix Reverse Merge
Fix faulty merge