Removes the declaration conflicts