Merge and fix