remove stray merge debris