try to handle all conflict
These are versions of this script where the code was updated. Show all versions.