try using list of scans
fix merge conflict