attempt to merge 6