Removed conflicting code from previous source pull