commented out lines that use attributes
manual merge