Improve handling of double done
merge