use slock instead of slock
updated the locking command
merging