change query
done merge
done merge