Fix declaration conflicts