Update smart.json

fix bad conflict
Update smart.lock

Fix bad conflict resolution
add conflict resolution methods