intermediate commit
merge lines
incorporate recent changes