evolvecmd: the proper way to deal with conflicts is to resolve them And it's worth making the suggestion an actual hint.

#!/bin/sh
sleep 5
echo "new desc" >> $1