Auto stash before merge of "master" and "origin/master"

Fixed merge conflict in the sample scene - Changed detectiveID from 0 to 1;