Update smart.lock

Fix bad conflict resolution