merge 12\05