Removed a leftover from conflict resolution