Fixing Post Merge