scanner
fixed merge