Post Merge Tidy