change scanning, debug
merge resolve