better LockConflict message
Merge pull request #56 from pitr-ch/master

better LockConflict message