fixing merge errors in smart.lock