merge resolve
race card style changes
recommit smart.lock
Merge branch 'tmp'