Merge conflicts on dead code