Merge and Fix