DB Fix Merge Artifacts