conflicts smatch
